Fix mail locking for Debian's non-Linux architectures.

diff --git a/debian/changelog b/debian/changelog
index d7931ff324d83248fc6ad44e1c915aecb86de689..84a566850026d27143f60cc9145f170149a256f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emacs22 (22.1+1-2) unstable; urgency=low
+
+  * Fix mail locking patch for Debian's non-Linux architectures.  Thanks
+    to Michael Banck <mbanck@debian.org>.  (closes: #433816) [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 29 Jul 2007 19:04:00 -0700
+
 emacs22 (22.1+1-1) unstable; urgency=low
 
   * New upstream release. (closes: #427279) [rlb]

diff --git a/debian/patches/require-movemail-use-liblockfile.diff b/debian/patches/require-movemail-use-liblockfile.diff
index 1187b5e05a9516afe8d8a6767748d6442cd48f36..f398e8baea23d1ddeb9950662c6a741dd4738d3c 100644 (file)
--- a/debian/patches/require-movemail-use-liblockfile.diff
+++ b/debian/patches/require-movemail-use-liblockfile.diff
@@ -22,3 +22,19 @@ Index: sid/lib-src/movemail.c
  int
  main (argc, argv)
       int argc;
+Index: sid/src/s/bsd4-3.h
+===================================================================
+--- sid.orig/src/s/bsd4-3.h
++++ sid/src/s/bsd4-3.h
+@@ -98,7 +98,11 @@
+    The alternative is that a lock file named
+    /usr/spool/mail/$USER.lock.  */
+ 
++/* conditional copied from gnu-linux.h */
++#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) && \
++      defined (HAVE_MAILLOCK_H))
+ #define MAIL_USE_FLOCK
++#endif
+ 
+ /* Define CLASH_DETECTION if you want lock files to be written
+    so that Emacs can tell instantly when you try to modify